Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 18 May 2010 22:45:34 +0000 (22:45 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 18 May 2010 22:45:34 +0000 (22:45 +0000)

Trivial merge